Check-in refactoring for the night.