Checkstyle fixes/ignores
checkstyle fixes