add: diagram clean and new format