fixed mixed terminology
fixed comma placement