Several refactorings and additions: