Refactoring, simplifying.