Document and cleanup
Automated tidy
Cleanup