Fix Checkstyle violations