Refactoring. sort of.