clean up
more changes