OGM-208 Fix checkstyle violations
fix
fix
fix
fix