Feature/docs and refactor

Merged Michelle Weidling requested to merge feature/docs-and-refactor into develop

Merge request reports