Misc

Some formatting, whitespace, and other minor tweaks.

@dinhviethoa @gaurave