diff --git a/Configurations/XIdentityConfiguration.cs b/Configurations/XIdentityConfiguration.cs
index d8c83f1..8b08015 100644
--- a/Configurations/XIdentityConfiguration.cs
+++ b/Configurations/XIdentityConfiguration.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using xIdentityModels.Dtos;
+using System.Collections.Generic;
 
 namespace xIdentityModels.Configurations {
     public class XIdentityConfiguration {
diff --git a/Dtos/XDiscoveryDocumentDto.cs b/Dtos/XDiscoveryDocumentDto.cs
index f51e542..46e748c 100644
--- a/Dtos/XDiscoveryDocumentDto.cs
+++ b/Dtos/XDiscoveryDocumentDto.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace xIdentityModels.Dtos
 {
diff --git a/Dtos/XFriendDto.cs b/Dtos/XFriendDto.cs
index 0663aa4..2a42259 100644
--- a/Dtos/XFriendDto.cs
+++ b/Dtos/XFriendDto.cs
@@ -1,5 +1,5 @@
-using xIdentityModels.Constants;
 using xModels.Base;
+using xIdentityModels.Constants;
 
 namespace xIdentityModels.Dtos
 {
diff --git a/Dtos/XOpenActionDto.cs b/Dtos/XOpenActionDto.cs
index 0841e28..5f01cfd 100644
--- a/Dtos/XOpenActionDto.cs
+++ b/Dtos/XOpenActionDto.cs
@@ -1,7 +1,7 @@
 using System;
-using xCommons.Extensions;
 using xModels.Base;
 using xModels.Dtos;
+using xCommons.Extensions;
 
 namespace xIdentityModels.Dtos
 {
diff --git a/Dtos/XProfileImageDto.cs b/Dtos/XProfileImageDto.cs
index 0c04a2d..48824f1 100644
--- a/Dtos/XProfileImageDto.cs
+++ b/Dtos/XProfileImageDto.cs
@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using xModels.Base;
+using Newtonsoft.Json;
 
 namespace xIdentityModels.Dtos {
     public class XProfileImageDto : XBaseDto {
diff --git a/Dtos/XUserNameIdRequest.cs b/Dtos/XUserNameIdRequest.cs
index 961bc00..ccdbb8c 100644
--- a/Dtos/XUserNameIdRequest.cs
+++ b/Dtos/XUserNameIdRequest.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using xModels.Base;
+using System.Collections.Generic;
 
 namespace xIdentityModels.Dtos {
     public class XUserNameIdRequest : XBaseDto {
diff --git a/Dtos/XUserProfileDto.cs b/Dtos/XUserProfileDto.cs
index 269d8f1..42f96a6 100644
--- a/Dtos/XUserProfileDto.cs
+++ b/Dtos/XUserProfileDto.cs
@@ -1,8 +1,8 @@
 using System;
-using System.Collections.Generic;
+using xModels.Base;
 using Newtonsoft.Json;
 using xIdentityModels.Constants;
-using xModels.Base;
+using System.Collections.Generic;
 
 namespace xIdentityModels.Dtos {
     public class XUserProfileDto : XBaseDto {
diff --git a/Extensions/DIExtensions.cs b/Extensions/DIExtensions.cs
index b7a185e..ef23b22 100644
--- a/Extensions/DIExtensions.cs
+++ b/Extensions/DIExtensions.cs
@@ -1,7 +1,7 @@
-using Microsoft.Extensions.DependencyInjection;
 using xCommons.Extensions;
-using xIdentityModels.Interfaces;
 using xIdentityModels.Providers;
+using xIdentityModels.Interfaces;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace xIdentityModels.Extensions {
     public static class DIExtensions {
@@ -10,6 +10,7 @@ namespace xIdentityModels.Extensions {
         /// user not provided we create this helper ...
         /// </summary>
         /// <param name="services"></param>
+        /// <param name="helper"></param>
         public static void AddXUserRoleHandler (
             this IServiceCollection services,
             IXUserRoleHelper helper = null
diff --git a/Extensions/XIdentityExtensions.cs b/Extensions/XIdentityExtensions.cs
index abcaf9c..598958a 100644
--- a/Extensions/XIdentityExtensions.cs
+++ b/Extensions/XIdentityExtensions.cs
@@ -1,8 +1,8 @@
-using System.Collections.Generic;
 using xCommons.Extensions;
 using xExceptions.Constants;
-using xIdentityModels.Constants;
 using xIdentityModels.Models;
+using xIdentityModels.Constants;
+using System.Collections.Generic;
 
 namespace xIdentityModels.Extensions {
     public static class XIdentityExtensions {
diff --git a/Extensions/XModelExtensions.cs b/Extensions/XModelExtensions.cs
index 6ae1704..502b34d 100644
--- a/Extensions/XModelExtensions.cs
+++ b/Extensions/XModelExtensions.cs
@@ -1,8 +1,8 @@
 using System;
-using System.Collections.Generic;
 using xCommons.Extensions;
-using xIdentityModels.Descriptors;
 using xIdentityModels.Models;
+using System.Collections.Generic;
+using xIdentityModels.Descriptors;
 using xIdentityModels.Navigations;
 
 namespace xIdentityModels.Extensions {
diff --git a/Extensions/XTokenExtensions.cs b/Extensions/XTokenExtensions.cs
index c510ac7..9d98431 100644
--- a/Extensions/XTokenExtensions.cs
+++ b/Extensions/XTokenExtensions.cs
@@ -1,20 +1,20 @@
 using System;
-using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
 using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using IdentityModel.Client;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.IdentityModel.Tokens;
 using xCommons.Constants;
 using xCommons.Extensions;
+using IdentityModel.Client;
 using xExceptions.Constants;
-using xIdentityModels.Constants;
+using System.Security.Claims;
+using System.Threading.Tasks;
 using xIdentityModels.Models;
+using System.Net.Http.Headers;
+using Microsoft.AspNetCore.Http;
+using xIdentityModels.Constants;
+using Microsoft.IdentityModel.Tokens;
+using System.IdentityModel.Tokens.Jwt;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Authentication;
 
 namespace xIdentityModels.Extensions {
     public static class XTokenExtensions {
@@ -440,6 +440,7 @@ namespace xIdentityModels.Extensions {
         /// </summary>
         /// <param name="source"></param>
         /// <param name="model"></param>
+        /// <param name="secret"></param>
         public static void SetXAuthenticationTokens (
             this IHeaderDictionary source,
             XLoginResponse model,
@@ -469,6 +470,7 @@ namespace xIdentityModels.Extensions {
         /// </summary>
         /// <param name="source"></param>
         /// <param name="model"></param>
+        /// <param name="secret"></param>
         public static void SetXAuthenticationTokens (
             this IHeaderDictionary source,
             XTokenResponse model,
@@ -596,6 +598,7 @@ namespace xIdentityModels.Extensions {
         /// </summary>
         /// <param name="source"></param>
         /// <param name="model"></param>
+        /// <param name="secret"></param>
         public static void SetXAuthenticationTokens (
             this HttpResponse source,
             XLoginResponse model,
@@ -612,6 +615,7 @@ namespace xIdentityModels.Extensions {
         /// </summary>
         /// <param name="source"></param>
         /// <param name="model"></param>
+        /// <param name="secret"></param>
         public static void SetXAuthenticationTokens (
             this HttpResponse source,
             XTokenResponse model,
diff --git a/Extensions/xIdentityModelsExtensions.cs b/Extensions/xIdentityModelsExtensions.cs
index e315a67..6daae10 100644
--- a/Extensions/xIdentityModelsExtensions.cs
+++ b/Extensions/xIdentityModelsExtensions.cs
@@ -1,10 +1,10 @@
-using System.Collections.Generic;
 using System.Linq;
 using xCommons.Extensions;
-using xIdentityModels.Configurations;
-using xIdentityModels.Constants;
 using xIdentityModels.Dtos;
 using xIdentityModels.Models;
+using xIdentityModels.Constants;
+using System.Collections.Generic;
+using xIdentityModels.Configurations;
 
 namespace xIdentityModels.Extensions
 {
diff --git a/Models/XBannedDevice.cs b/Models/XBannedDevice.cs
index 5606b1d..3de279f 100644
--- a/Models/XBannedDevice.cs
+++ b/Models/XBannedDevice.cs
@@ -1,8 +1,8 @@
 using System;
-using System.ComponentModel.DataAnnotations.Schema;
+using xModels.Base;
 using xCommons.Extensions;
 using xIdentityModels.Navigations;
-using xModels.Base;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace xIdentityModels.Models {
     public class XBannedDevice : XBaseIntIDEntity {
diff --git a/Models/XLoginRequest.cs b/Models/XLoginRequest.cs
index 49ad562..8f59577 100644
--- a/Models/XLoginRequest.cs
+++ b/Models/XLoginRequest.cs
@@ -1,5 +1,5 @@
-using System.ComponentModel.DataAnnotations;
 using xIdentityModels.Navigations;
+using System.ComponentModel.DataAnnotations;
 
 namespace xIdentityModels.Models {
     /// <summary>
diff --git a/Models/XProfileUpdateRequest.cs b/Models/XProfileUpdateRequest.cs
index f451873..1914566 100644
--- a/Models/XProfileUpdateRequest.cs
+++ b/Models/XProfileUpdateRequest.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
 using xIdentityModels.Constants;
+using System.Collections.Generic;
 
 namespace xIdentityModels.Models {
     public class XProfileUpdateRequest {
diff --git a/Models/XToken.cs b/Models/XToken.cs
index d5ab94f..b5d57d8 100644
--- a/Models/XToken.cs
+++ b/Models/XToken.cs
@@ -1,8 +1,8 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using xModels.Base;
 using xCommons.Extensions;
 using xIdentityModels.Constants;
 using xIdentityModels.Navigations;
-using xModels.Base;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace xIdentityModels.Models {
     public class XToken : XBaseIntIDEntity {
diff --git a/Models/XUserClaimsInfoDto.cs b/Models/XUserClaimsInfoDto.cs
index 4499082..0b57249 100644
--- a/Models/XUserClaimsInfoDto.cs
+++ b/Models/XUserClaimsInfoDto.cs
@@ -1,13 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Security.Claims;
+using xModels.Base;
+using xCommons.Helpers;
 using xCommons.Constants;
 using xCommons.Extensions;
-using xCommons.Helpers;
 using xExceptions.Constants;
+using System.Security.Claims;
 using xIdentityModels.Constants;
-using xModels.Base;
+using System.Collections.Generic;
 
 namespace xIdentityModels.Models
 {
diff --git a/Models/XVerificationRequest.cs b/Models/XVerificationRequest.cs
index 9eeac99..260b8a3 100644
--- a/Models/XVerificationRequest.cs
+++ b/Models/XVerificationRequest.cs
@@ -1,9 +1,9 @@
 using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
+using xModels.Base;
 using xCommons.Extensions;
 using xIdentityModels.Navigations;
-using xModels.Base;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace xIdentityModels.Models {
     public class XVerificationRequest : XBaseIntIDEntity {
diff --git a/Navigations/XDevice.cs b/Navigations/XDevice.cs
index ad7ad30..152f8ac 100644
--- a/Navigations/XDevice.cs
+++ b/Navigations/XDevice.cs
@@ -1,6 +1,6 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using xCommons.Constants;
 using xModels.Base;
+using xCommons.Constants;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace xIdentityModels.Navigations {
     /// <summary>
diff --git a/Navigations/XFriendshipFollower.cs b/Navigations/XFriendshipFollower.cs
index 53b19c4..d5f3be6 100644
--- a/Navigations/XFriendshipFollower.cs
+++ b/Navigations/XFriendshipFollower.cs
@@ -1,6 +1,6 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using xIdentityModels.Constants;
 using xModels.Base;
+using xIdentityModels.Constants;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace xIdentityModels.Navigations {
     /// <summary>
diff --git a/Navigations/XFriendshipFollowing.cs b/Navigations/XFriendshipFollowing.cs
index bf70518..85a1b81 100644
--- a/Navigations/XFriendshipFollowing.cs
+++ b/Navigations/XFriendshipFollowing.cs
@@ -1,6 +1,6 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using xIdentityModels.Constants;
 using xModels.Base;
+using xIdentityModels.Constants;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace xIdentityModels.Navigations {
     /// <summary>
diff --git a/Navigations/XProfileImage.cs b/Navigations/XProfileImage.cs
index 2e586ee..f2f87f9 100644
--- a/Navigations/XProfileImage.cs
+++ b/Navigations/XProfileImage.cs
@@ -1,7 +1,7 @@
 using System;
+using xModels.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using xModels.Base;
 
 namespace xIdentityModels.Navigations {
     /// <summary>
diff --git a/XApiToken.cs b/XApiToken.cs
index 78a24a9..5c70a36 100644
--- a/XApiToken.cs
+++ b/XApiToken.cs
@@ -1,7 +1,7 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using xCommons.Extensions;
 using xModels.Base;
+using xCommons.Extensions;
 using xIdentityModels.Models;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace xIdentityModels {
     public class XApiToken : XBaseIntIDEntity {
diff --git a/XUser.cs b/XUser.cs
index 83c23f1..53d381e 100644
--- a/XUser.cs
+++ b/XUser.cs
@@ -1,10 +1,10 @@
 using System;
+using xIdentityModels.Constants;
 using System.Collections.Generic;
+using xIdentityModels.Navigations;
+using Microsoft.AspNetCore.Identity;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.AspNetCore.Identity;
-using xIdentityModels.Constants;
-using xIdentityModels.Navigations;
 
 namespace xIdentityModels
 {