Cleaning code and adding sonar configuration