Refactored deadline handling a bit