diff --git a/Demo/YYKitDemo/T1Model.h b/Demo/YYKitDemo/T1Model.h
index 8bca93ec..62924337 100644
--- a/Demo/YYKitDemo/T1Model.h
+++ b/Demo/YYKitDemo/T1Model.h
@@ -201,7 +201,7 @@
 @property (nonatomic, assign) uint32_t participantsCount;
 @property (nonatomic, assign) uint32_t targetCount; // 0 if no target items
 @property (nonatomic, strong) NSString *rootUserID;
-@property (nonatomic, strong) NSArray *contextIDs; //<
+@property (nonatomic, strong) NSArray *contextIDs; ///<
 @property (nonatomic, strong) NSArray *entityIDs;
 
 @property (nonatomic, strong) NSArray *tweets; // Array<T1Tweet>
diff --git a/Demo/YYKitDemo/WBStatusCell.m b/Demo/YYKitDemo/WBStatusCell.m
index 73b85413..d1c7fd4b 100644
--- a/Demo/YYKitDemo/WBStatusCell.m
+++ b/Demo/YYKitDemo/WBStatusCell.m
@@ -754,7 +754,7 @@ - (void)setLayout:(WBStatusLayout *)layout {
     [_profileView.avatarView setImageWithURL:layout.status.user.avatarLarge //profileImageURL
                                  placeholder:nil
                                      options:kNilOptions
-                                     manager:[WBStatusHelper avatarImageManager] //< 圆角头像manager，内置圆角处理
+																		 manager:[WBStatusHelper avatarImageManager] ///< 圆角头像manager，内置圆角处理
                                     progress:nil
                                    transform:nil
                                   completion:nil];
@@ -981,7 +981,7 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSStr
 }
 
 - (void)prepareForReuse {
-    // ignore
+	[super prepareForReuse];
 }
 
 - (void)setLayout:(WBStatusLayout *)layout {
diff --git a/Demo/YYKitDemo/YYWebImageExample.m b/Demo/YYKitDemo/YYWebImageExample.m
index b36bc8c5..b2ffe967 100644
--- a/Demo/YYKitDemo/YYWebImageExample.m
+++ b/Demo/YYKitDemo/YYWebImageExample.m
@@ -103,7 +103,7 @@ - (void)setImageURL:(NSURL *)url {
 }
 
 - (void)prepareForReuse {
-    //nothing
+	[super prepareForReuse];
 }
 
 @end
diff --git a/YYKit/Base/Quartz/YYCGUtilities.h b/YYKit/Base/Quartz/YYCGUtilities.h
index d9725a6a..afff1e63 100644
--- a/YYKit/Base/Quartz/YYCGUtilities.h
+++ b/YYKit/Base/Quartz/YYCGUtilities.h
@@ -33,10 +33,10 @@ CGContextRef _Nullable YYCGContextCreateGrayBitmapContext(CGSize size, CGFloat s
 
 
 /// Get main screen's scale.
-CGFloat YYScreenScale();
+CGFloat YYScreenScale(void);
 
 /// Get main screen's size. Height is always larger than width.
-CGSize YYScreenSize();
+CGSize YYScreenSize(void);
 
 
 
diff --git a/YYKit/Base/YYKitMacro.h b/YYKit/Base/YYKitMacro.h
index 8ff11f86..800fd919 100644
--- a/YYKit/Base/YYKitMacro.h
+++ b/YYKit/Base/YYKitMacro.h
@@ -291,7 +291,7 @@ static inline bool dispatch_is_main_queue() {
 /**
  Submits a block for asynchronous execution on a main queue and returns immediately.
  */
-static inline void dispatch_async_on_main_queue(void (^block)()) {
+static inline void dispatch_async_on_main_queue(void (^block)(void)) {
     if (pthread_main_np()) {
         block();
     } else {
@@ -302,7 +302,7 @@ static inline void dispatch_async_on_main_queue(void (^block)()) {
 /**
  Submits a block for execution on a main queue and waits until the block completes.
  */
-static inline void dispatch_sync_on_main_queue(void (^block)()) {
+static inline void dispatch_sync_on_main_queue(void (^block)(void)) {
     if (pthread_main_np()) {
         block();
     } else {
diff --git a/YYKit/Image/YYImageCoder.h b/YYKit/Image/YYImageCoder.h
index 45bfb918..9206b1e3 100644
--- a/YYKit/Image/YYImageCoder.h
+++ b/YYKit/Image/YYImageCoder.h
@@ -368,10 +368,10 @@ CG_EXTERN NSString *_Nullable YYImageTypeGetExtension(YYImageType type);
 
 
 /// Returns the shared DeviceRGB color space.
-CG_EXTERN CGColorSpaceRef YYCGColorSpaceGetDeviceRGB();
+CG_EXTERN CGColorSpaceRef YYCGColorSpaceGetDeviceRGB(void);
 
 /// Returns the shared DeviceGray color space.
-CG_EXTERN CGColorSpaceRef YYCGColorSpaceGetDeviceGray();
+CG_EXTERN CGColorSpaceRef YYCGColorSpaceGetDeviceGray(void);
 
 /// Returns whether a color space is DeviceRGB.
 CG_EXTERN BOOL YYCGColorSpaceIsDeviceRGB(CGColorSpaceRef space);
@@ -446,7 +446,7 @@ CG_EXTERN CFDataRef _Nullable YYCGImageCreateEncodedData(CGImageRef imageRef, YY
 /**
  Whether WebP is available in YYImage.
  */
-CG_EXTERN BOOL YYImageWebPAvailable();
+CG_EXTERN BOOL YYImageWebPAvailable(void);
 
 /**
  Get a webp image frame count;
diff --git a/YYKit/Model/NSObject+YYModel.m b/YYKit/Model/NSObject+YYModel.m
index d45c6fe9..3e4ee48d 100644
--- a/YYKit/Model/NSObject+YYModel.m
+++ b/YYKit/Model/NSObject+YYModel.m
@@ -1062,9 +1062,9 @@ static void ModelSetValueForProperty(__unsafe_unretained id model,
                 
             case YYEncodingTypeBlock: {
                 if (isNull) {
-                    ((void (*)(id, SEL, void (^)()))(void *) objc_msgSend)((id)model, meta->_setter, (void (^)())NULL);
+									((void (*)(id, SEL, void (^)(void)))(void *) objc_msgSend)((id)model, meta->_setter, (void (^)(void))NULL);
                 } else if ([value isKindOfClass:YYNSBlockClass()]) {
-                    ((void (*)(id, SEL, void (^)()))(void *) objc_msgSend)((id)model, meta->_setter, (void (^)())value);
+									((void (*)(id, SEL, void (^)(void)))(void *) objc_msgSend)((id)model, meta->_setter, (void (^)(void))value);
                 }
             } break;
                 
diff --git a/YYKit/Text/String/YYTextUtilities.h b/YYKit/Text/String/YYTextUtilities.h
index dd1c2556..20b72419 100644
--- a/YYKit/Text/String/YYTextUtilities.h
+++ b/YYKit/Text/String/YYTextUtilities.h
@@ -251,13 +251,13 @@ static inline UTF32Char UTF16SurrogatePairToUTF32Char(UTF16Char char16[_Nonnull
  Get the character set which should rotate in vertical form.
  @return The shared character set.
  */
-NSCharacterSet *YYTextVerticalFormRotateCharacterSet();
+NSCharacterSet *YYTextVerticalFormRotateCharacterSet(void);
 
 /**
  Get the character set which should rotate and move in vertical form.
  @return The shared character set.
  */
-NSCharacterSet *YYTextVerticalFormRotateAndMoveCharacterSet();
+NSCharacterSet *YYTextVerticalFormRotateAndMoveCharacterSet(void);
 
 NS_ASSUME_NONNULL_END
 YY_EXTERN_C_END
diff --git a/YYKit/Utility/YYAsyncLayer.m b/YYKit/Utility/YYAsyncLayer.m
index 9a5c6dc5..c09f4a5c 100644
--- a/YYKit/Utility/YYAsyncLayer.m
+++ b/YYKit/Utility/YYAsyncLayer.m
@@ -120,7 +120,7 @@ - (void)_displayAsync:(BOOL)async {
         if (task.willDisplay) task.willDisplay(self);
         YYSentinel *sentinel = _sentinel;
         int32_t value = sentinel.value;
-        BOOL (^isCancelled)() = ^BOOL() {
+			BOOL (^isCancelled)(void) = ^BOOL() {
             return value != sentinel.value;
         };
         CGSize size = self.bounds.size;
diff --git a/YYKit/Utility/YYDispatchQueuePool.m b/YYKit/Utility/YYDispatchQueuePool.m
index 85bfb58e..50bd2eda 100644
--- a/YYKit/Utility/YYDispatchQueuePool.m
+++ b/YYKit/Utility/YYDispatchQueuePool.m
@@ -12,6 +12,7 @@
 #import "YYDispatchQueuePool.h"
 #import <UIKit/UIKit.h>
 #import <libkern/OSAtomic.h>
+#import <stdatomic.h>
 
 #define MAX_QUEUE_COUNT 32
 
@@ -93,7 +94,8 @@ static void YYDispatchContextRelease(YYDispatchContext *context) {
 }
 
 static dispatch_queue_t YYDispatchContextGetQueue(YYDispatchContext *context) {
-    uint32_t counter = (uint32_t)OSAtomicIncrement32(&context->counter);
+	  _Atomic uint32_t counter = atomic_fetch_add_explicit(&counter, 1, memory_order_relaxed);
+		counter = ++context->counter;
     void *queue = context->queues[counter % context->queueCount];
     return (__bridge dispatch_queue_t)(queue);
 }