refactor(deferred): minor improvements