contacts refactored