Removing utils from lib and putting in as a helper