clean up a bit
more clean up