Cmd: Refactor delay command