Clean naming conventions and add graphviz support