Style fixes for util package