Minor refactoring
Changes to tke car of openfisca-survey-manager dependency