refactor responsive-utilities slightly
Merge pull request #8291 from cvrebert/refactor

refactor responsive-utilities slightly