Cleaned up cell and cell_spec