Fixed some several hundred Checkstyle warnings - about 1500 remaining