Move logic out of class helper method
Merge pull request #806 from iHiD/refactor_extract_mentions

Move logic out of class helper method