massive file tidyup