Added other Youtube providers as reference
Small code smells fixed