did some more clean up