Clean up & reorg