refactored user names and captions