Refactoring Grid