Tidyup doc
Merge branch 'feature/tidyup-doc' into feature/views

* feature/tidyup-doc:
  Tidyup doc