More refactoring and store user name retrieved.