Clean up and more documentation.