DATACOUCH-21 - Documentation and Formatting improvements