more refactoring of methods in Grid class