Clean up a bit...