code clean up of Video class