Slightly optimize readiness code