Fix/sonar lint check

Martin Slind Hagenrequested to merge
fix/SonarLintCheck into dev

#73 (closed) Went through the project and corrected code smell with sonar lint

Merge request reports