Minor refactoring, fixing SonarQube issues