CON-2287 | Refactoring of In Content Videos Module

These can all be placed on separate lines if you're running out of space here (rather than remove spaces after commas) ;)