Split Decode from Execute
Fix bugs in provided code