formatting & style tweaks