clean the code with sonar