ETL some updates for Sonar quality code