Finish this round of refactoring