246 Refactoring