Function library refactored, GetCellValue as variable