Refactored things into ContactTools.