Adds many more YouTubers
Minor refactoring