Rolled back changes to make_uh.py

These changes could be reimplemented when there is more time as there is likely significant oportunity for optimization in the core loops in make_uh.py
update to variable names and attributes