Cleanup and documentation improvement.