ZEF-8 fixed some checkstyle warnings