A little cleanup refactoring.