AddContact refactored && commented