A little more refactoring done.