cleaning up some variable assignments