METAGEN-103 Fixing existing checkstyle violations