Code cleanup and changed instruction format 7 to fit an xpvm format.