DRY Improvements (Delay)

Cleaned up delay controls.