#34 - Fix all Sonar issues