Very, very lightly refactoring.