A little more code refactoring.