More checkstyle fixes
Finished fixing checkstyle errors for the remaining utils