A bit more cleaning up.