fixed inheritance
fixed some sonar issues