small syntax modifications