Moar style fixes from popdown menu
Merge branch 'cole'