A moderate amount of refactoring