reformated some classes to fix sonar issues