Improved naming and removed interrupt driven delay usage