Cleanup, and added id to video for manipulation later.