More minor refactoring...