Clean code

assigned to @benoit

created branch 9-clean-code to address this issue

mentioned in merge request !8 (merged)

mentioned in commit d05ce606

closed with merge request !8 (merged)