Just a bit of cleaning up.