Tidying up Syntax and Stratego code