Refactor Contact Class.