Just cleaning up a bit...