Revert "refactor to remove ready variable"

This reverts commit 75881f6adb2ac009210b2a720d6aac42628cb9fd.
0.5.0