giphy refactor