Clean up username fn