saving contacts & refactoring