Cleanup/refactor - Don't use initials for username