some little cleaning done

chg reordering of regexp mask to have stock first then mods