cleaning
a bunch of changes