Refactoring of grid--gutter-cross