EMBRYO-224, EMBRYO-225: checkstyle corrections