Further cleaned up the Video code.