Cleanup
Added Util class and done some cleanup
Renamed Timer class