Making the Contacts class more classy