CDR-48 fixed checkstyle issues