Remove code smell introduced by Sonarcloud quality gate

Since binding this project to Sonarcloud, a new quality gate has been set up. This will undoubtedly introduce a bit of new code smell. These issues are minor but will need to be resolved.

Relates to #135 (closed)