Refactoring (continue)