Revert "Revert "Simplify instructions""

This reverts commit 7f97015f51896176e30d2c7c19e01da51990619e.