Some reek cleanup.