Refactoring less.