Added env var to set username.  Minor ode shuffle.