Cleaning up some style