#60 refactoring ContactData