Fixed a few style errors and smells