Refactor echonest lookup