Refactoring. A little more.