Documentation and cleaning