checkstyle fixes and less double[]-arrayery