clean up + add new fields "email" and "telephone"