Can now tidy up groups of variable assignments