Fixed more style guide violations.