more clean up. think i'm done.