Refactoring (cont'd)