Some cleaning and reorg