Refactor responsive