some clean up on opcodes and times