still cleaning

Lots of changes to be made