Refactoring 011