1096 Refactoring