cleaned up cell data routing