Clean up and document
2.0.0