CFY-1071 fixed checkstyle issues.