Changes to conform to new Checkstyle rules