cleaned with sonarqube fixed clean up and formatter to comply with sonar
rules