Refactor model: cleanup

t.knopffrequested to merge
refactor_model into develop

This MR contains some smaller cleanup before moving on to implement #109 (closed)

Merge request reports