+ adjust visibility
+ fix some sonar issues