allow abbrev to expand in comment or string. plus code format change