Refactoring 1.0