Minor cleaning up.