Cleanup
Use tool registry
Rename ax->axes
indent fix