Fixed a few style issues