Refactoring 1.1