remove double graphs, and improve format
Merge branch 'graphs'