Started cleaning up cell creation code