cleaning

some sensible cleaning changes