Cleanup, and added Utilities class