Ongoing improvements and refactorings.