fixed some issues reported by Sonar
parsing argument using JCommander in EXTRACT_CONTRIB_GIVENDATA
EXTRACT_CONTRIB_GIVEN.. refactoring
cosmetic