cleaned up a bit..