Refactor duration