Clean / move some code

assigned to @benoit

created branch 35-clean-move-some-code to address this issue

mentioned in merge request !31 (merged)

mentioned in commit 8a60fb29

closed with merge request !31 (merged)