Merge pull request #357 from digawp/documentations
Updating documentations and minor refactoring

(main@fb9f23268387a85f010371d9d5fef33b4a83f35b)