Improve / clean some code

assigned to @benoit

created branch 56-improve-clean-some-code to address this issue

mentioned in merge request !52 (merged)

mentioned in commit 7fd165e0

closed with merge request !52 (merged)