Refactoring things.