Improve contact informations.
Cleanup.