refactoring twitch, fixing urls