fixed some sonar points like variable-names and access modifier