Fix some style atrocities