STY: Misc stylistic changes