Refactoring 1.01