Refactor response time