fix style and comments