more cleaning
more changes