Fix Checkstyle Issues pt