Refactor spotify