DDF-749 Fixed checkstyle issues