Refactored away util module
was so tired of running tests manually..
cleanup