refactor disarm delay