Fixed style guide violations