cleaning up a bit..