Refactors and cleans up code
Adding hashtags, mentions