Code cleaning + pom update to include coverage in Sonar 4.3