Refactoring usernames and captions