Made some code in Grid a little cleaner