More clean-up and documentation.