Clean up
Move utility functions to Util classes