Tidy up video model code