Better documentation
Formatting improvements