Refactoring to clean up spotify utility functions mostly.