Refactoring spellchecking
More refactoring Spotify matching