111 Refactoring