More cleanup for style violations.