More and more refactoring.