Style cleanup.
Added the Contact.fromJson constructor plus style cleanup.