finish re-factoring of Blast code.