Documentation and simplification