Doing some more refactoring.