Fixed some problems identified by SonarCloud