Refactor and improved quick contact handling