Refactoring, adding url fixes to remove not used parameters (Youtube only!)