Clean up and documentation