Use new util functions instead of assigning from __main__