Refactor/grid