remove heap pointer; some minor modifications of mnemonic