More refactoring for grids and sheet_variables
Updated deprecated code