Cleaning up a bit...