made syntax more uniform