And a bit more refactoring.