A bit more refactoring...