Minor cleanup and documentation.