Fix Checkstyle Errors