Some more Checkstyle editing