Added more potential util methods and did some more cleanup