263 Refactoring