Lance - Refactor Contact

Small refactor.