A bunch of checkstyle fixes