improvements at syntax level