Fix style guide errors