Commits to implement Checkstyle fixes.