Tidy up some style