minor grid refactor