Documentation enhancement and simplification