More cleanup

Also try to fix the graph not showing up, but I have no idea what I'm doing.