Fix some issues with saving the contact
Format to PSR-2
Format to PSR-2