Cleaned up the sample code for Audio Video Simple Demo