more cleanup: removal of _ prefix from cell fields