Resolved MANY issues identified by SonarQube