Refactored userName