few syntax modifications