Refactoring 013