Checkstyle errors correction