-- minor fixes based on sonar suggestions