Misc minor tweaks
Misc whitespace