refactoring the safe? procedure.