Cleaning up some style bugs