Cleaning up a little more