Merge "Small code formatting changes" into jb-ub-gel-agar