Checkstyle almost fixed