cleaning up consolidation
cleaning up and reformatting in clean.py to track down why location merging isn't