Fixed a few style bugs