Cleaning up a little