Refactoring: third stage.