Refactoring grid block