made syntax more consistent