refactored and display username