244 Refactoring