Tweak and finalize refactored code for PopUser