188 Refactoring