redo fix
sonar-inspired cleanup