194 Refactoring