Bug: Fix SonarQube Errors and Code Smells

Following the merge of !72 (merged) for issue #74 (closed) (which is great by the way, thank you @JakeRandellOC).
Several bugs and code smells appeared on Sonar (see here).
We should fix them before the next release.