Cleaned up code; ran plots again