Fixes some style guide violations