Some tidying up
Rework cell distribution again