A bit of a code cleanup.