Clean code

assigned to @benoit

created branch 44-clean-code to address this issue

mentioned in merge request !42 (merged)

mentioned in commit 9d26ee74

closed with merge request !42 (merged)