Break Utility class up
Tiny cleanup