clean up the higher level calls, and formalize the host names and environments in a central place