Refactor to cleanup and organize the growing number of opcodes.