small code cleanup
also added new macro to declare opcodes and its macro usage - part 1