contact + refactor