EMBRYO-382, EMBRYO-379: checkstyle errors solved