Correct Checkstyle violations