Cleanup Utils
Working on #10 please check agian