clean up code, change back to SAUCE_USERNAME