Refactoring grid specs