Fixed yet more checkstyle warnings - now about 1000 remaining