Refactor responsive behavior