Checkstyle additions and fixes