Checkstyle and warning cleanup