Correct checkstyle errors