Fun with refactoring