Clean-up, Documentation and doctests.