Misc stylistic changes