Checkstyle approved