Refactor hashtags