address CR feedback: renames, handle smart indentation in type argument lists in type references