Tidied up setCellField