cleanup confusing variable names in run()