tidy up
second cleaning an renaming