Lots o' refactoring commits