diff --git a/.clang-tidy b/.clang-tidy
index 052456d..12b4a4a 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -76,28 +76,28 @@
 cert-oop11-cpp,
 cert-oop54-cpp,
 cert-oop57-cpp,
+clang-analyzer-apiModeling.StdCLibraryFunctions,
+clang-analyzer-apiModeling.TrustNonnull,
 clang-analyzer-apiModeling.google.GTest,
 clang-analyzer-apiModeling.llvm.CastValue,
 clang-analyzer-apiModeling.llvm.ReturnValue,
-clang-analyzer-apiModeling.StdCLibraryFunctions,
-clang-analyzer-apiModeling.TrustNonnull,
-clang-analyzer-core.builtin.BuiltinFunctions,
-clang-analyzer-core.builtin.NoReturnFunctions,
 clang-analyzer-core.CallAndMessageModeling,
 clang-analyzer-core.DivideZero,
 clang-analyzer-core.DynamicTypePropagation,
-clang-analyzer-core.NonnilStringConstants,
 clang-analyzer-core.NonNullParamChecker,
+clang-analyzer-core.NonnilStringConstants,
 clang-analyzer-core.NullDereference,
 clang-analyzer-core.StackAddrEscapeBase,
 clang-analyzer-core.StackAddressEscape,
 clang-analyzer-core.UndefinedBinaryOperatorResult,
+clang-analyzer-core.VLASize,
+clang-analyzer-core.builtin.BuiltinFunctions,
+clang-analyzer-core.builtin.NoReturnFunctions,
 clang-analyzer-core.uninitialized.ArraySubscript,
 clang-analyzer-core.uninitialized.Assign,
 clang-analyzer-core.uninitialized.Branch,
 clang-analyzer-core.uninitialized.CapturedBlockVariable,
 clang-analyzer-core.uninitialized.UndefReturn,
-clang-analyzer-core.VLASize,
 clang-analyzer-cplusplus.InnerPointer,
 clang-analyzer-cplusplus.Move,
 clang-analyzer-cplusplus.NewDelete,
@@ -109,22 +109,28 @@
 clang-analyzer-cplusplus.VirtualCallModeling,
 clang-analyzer-deadcode.DeadStores,
 clang-analyzer-fuchsia.HandleChecker,
+clang-analyzer-nullability.NullPassedToNonnull,
+clang-analyzer-nullability.NullReturnedFromNonnull,
 clang-analyzer-nullability.NullabilityBase,
 clang-analyzer-nullability.NullableDereferenced,
 clang-analyzer-nullability.NullablePassedToNonnull,
 clang-analyzer-nullability.NullableReturnedFromNonnull,
-clang-analyzer-nullability.NullPassedToNonnull,
-clang-analyzer-nullability.NullReturnedFromNonnull,
 clang-analyzer-optin.cplusplus.UninitializedObject,
 clang-analyzer-optin.cplusplus.VirtualCall,
 clang-analyzer-optin.mpi.MPI-Checker,
+clang-analyzer-optin.osx.OSObjectCStyleCast,
 clang-analyzer-optin.osx.cocoa.localizability.EmptyLocalizationContextChecker,
 clang-analyzer-optin.osx.cocoa.localizability.NonLocalizedStringChecker,
-clang-analyzer-optin.osx.OSObjectCStyleCast,
 clang-analyzer-optin.performance.GCDAntipattern,
 clang-analyzer-optin.performance.Padding,
 clang-analyzer-optin.portability.UnixAPI,
 clang-analyzer-osx.API,
+clang-analyzer-osx.MIG,
+clang-analyzer-osx.NSOrCFErrorDerefChecker,
+clang-analyzer-osx.NumberObjectConversion,
+clang-analyzer-osx.OSObjectRetainCount,
+clang-analyzer-osx.ObjCProperty,
+clang-analyzer-osx.SecKeychainAPI,
 clang-analyzer-osx.cocoa.AtSync,
 clang-analyzer-osx.cocoa.AutoreleaseWrite,
 clang-analyzer-osx.cocoa.ClassRelease,
@@ -132,10 +138,10 @@
 clang-analyzer-osx.cocoa.IncompatibleMethodTypes,
 clang-analyzer-osx.cocoa.Loops,
 clang-analyzer-osx.cocoa.MissingSuperCall,
-clang-analyzer-osx.cocoa.NilArg,
-clang-analyzer-osx.cocoa.NonNilReturnValue,
 clang-analyzer-osx.cocoa.NSAutoreleasePool,
 clang-analyzer-osx.cocoa.NSError,
+clang-analyzer-osx.cocoa.NilArg,
+clang-analyzer-osx.cocoa.NonNilReturnValue,
 clang-analyzer-osx.cocoa.ObjCGenerics,
 clang-analyzer-osx.cocoa.RetainCount,
 clang-analyzer-osx.cocoa.RetainCountBase,
@@ -149,36 +155,30 @@
 clang-analyzer-osx.coreFoundation.CFRetainRelease,
 clang-analyzer-osx.coreFoundation.containers.OutOfBounds,
 clang-analyzer-osx.coreFoundation.containers.PointerSizedValues,
-clang-analyzer-osx.MIG,
-clang-analyzer-osx.NSOrCFErrorDerefChecker,
-clang-analyzer-osx.NumberObjectConversion,
-clang-analyzer-osx.ObjCProperty,
-clang-analyzer-osx.OSObjectRetainCount,
-clang-analyzer-osx.SecKeychainAPI,
 clang-analyzer-security.FloatLoopCounter,
+clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
+clang-analyzer-security.insecureAPI.SecuritySyntaxChecker,
+clang-analyzer-security.insecureAPI.UncheckedReturn,
 clang-analyzer-security.insecureAPI.bcmp,
 clang-analyzer-security.insecureAPI.bcopy,
 clang-analyzer-security.insecureAPI.bzero,
 clang-analyzer-security.insecureAPI.decodeValueOfObjCType,
-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
 clang-analyzer-security.insecureAPI.getpw,
 clang-analyzer-security.insecureAPI.gets,
 clang-analyzer-security.insecureAPI.mkstemp,
 clang-analyzer-security.insecureAPI.mktemp,
 clang-analyzer-security.insecureAPI.rand,
-clang-analyzer-security.insecureAPI.SecuritySyntaxChecker,
 clang-analyzer-security.insecureAPI.strcpy,
-clang-analyzer-security.insecureAPI.UncheckedReturn,
 clang-analyzer-security.insecureAPI.vfork,
 clang-analyzer-unix.API,
-clang-analyzer-unix.cstring.BadSizeArg,
-clang-analyzer-unix.cstring.CStringModeling,
-clang-analyzer-unix.cstring.NullArg,
 clang-analyzer-unix.DynamicMemoryModeling,
 clang-analyzer-unix.Malloc,
 clang-analyzer-unix.MallocSizeof,
 clang-analyzer-unix.MismatchedDeallocator,
 clang-analyzer-unix.Vfork,
+clang-analyzer-unix.cstring.BadSizeArg,
+clang-analyzer-unix.cstring.CStringModeling,
+clang-analyzer-unix.cstring.NullArg,
 clang-analyzer-valist.CopyToSelf,
 clang-analyzer-valist.Uninitialized,
 clang-analyzer-valist.Unterminated,