Cleaning up a bit....