Checkstyle fixes

Fixed the critical checkstyle errors that break the build.