Misc style fixes

Auditors: eater