Refactoring contact edition