Improve/clean code

assigned to @benoit

created branch 39-improve-clean-code to address this issue

mentioned in merge request !36 (merged)

mentioned in commit 509782a9

closed with merge request !36 (merged)