MHCS java checkstyle fixes