Fix style and comments