Fix Checkstyle problems