Also added some additional helper methods and cleaned up some existing
ones