Finish score_cell function (and misc renamings)