Tidying grammar