cleaning up a little more