Reorg, cleanup and extension methods