[LVEE-2013] another reformat and some terms fix