GH137-code formatting
Merge remote-tracking branch 'origin/GH137-Code_Sync_Decorators_For_Diagrams'