Massive cleanup, added streaming service switcher