cleaning up the SetupUser code