Fix some style guide violations