Clean up and further graphing