Some documentation and clean up.