Refactored usernames and captions