partially through checkstyle fixes