Cleanup

Cobertura sonar conf & general cleanup