better syntax handling