Finish re-factoring from uTube to YouTube