- Some small refactorings.