Cleanup and further documentation.