Cleaned up surveillance plot code.