Refactor methods to fire callbacks & blocks in sync mode