Reduce sonar technical dept: readability