@ 02:10 hs - fix .dot output and refactor