Fix Checkstyle Issues