some cleanup
some more changes