Checkstyle Fixes