Refactoring 010