Refactored user names and captions 2