Remove PUSH/POP
Add constant values for commands