refactoring (cont.)