Refactored user names and captions
Refactored sharedInstance to use a shorter variable
Merge branch 'refactoring'