Clean up VideoView code