229 Refactoring