248 Refactoring