Small updated

No functional changes, only some best paretics and some check before
calling blocks