Fix style guide violations