Reorganizing and fixing instructions