refactored username into one place