Fixed even more Checkstyle warnings - now about 1200 remaining