Minor code cleanup + moved new contact creation to an inner class