A bit of cleaning up.