Doco and clean up.