Improve/update the design diagram.
Cleanup and simplify.