Cleanup and documentation