refactor, username