Contacts Refactoring (code re-adjustment)
Jira issue: WP-674