Misc cleanup + formatting consistency #31