A little more refactoring...