[#312] Whitespace & Alignment Cleanup

Small whitespace changes and modify the order of functions in the
Main.Utils module.

Closes #312: Fixup alignment