Cleaned up VideoTool code a bit.