Improve ducumentation