Clean up and further plotting