cleaning up a little