And more refactoring...