spotifycsrf: refactor