295 Refactoring