diff --git a/Pod/Classes/LiquidFloatingActionButton.swift b/Pod/Classes/LiquidFloatingActionButton.swift
index abdaa73..9b10549 100644
--- a/Pod/Classes/LiquidFloatingActionButton.swift
+++ b/Pod/Classes/LiquidFloatingActionButton.swift
@@ -115,7 +115,7 @@ open class LiquidFloatingActionButton : UIView {
 		
         // rotate plus icon
         CATransaction.setAnimationDuration(0.8)
-        self.plusLayer.transform = CATransform3DMakeRotation((CGFloat(M_PI) * rotationDegrees) / 180, 0, 0, 1)
+        self.plusLayer.transform = CATransform3DMakeRotation((.pi * rotationDegrees) / 180, 0, 0, 1)
 
         let cells = cellArray()
         for cell in cells {
@@ -151,7 +151,7 @@ open class LiquidFloatingActionButton : UIView {
         
         // draw plus shape
         let plusLayer = CAShapeLayer()
-        plusLayer.lineCap = kCALineCapRound
+        plusLayer.lineCap = CAShapeLayerLineCap.round
         plusLayer.strokeColor = UIColor.white.cgColor
         plusLayer.lineWidth = 3.0
         
@@ -262,9 +262,9 @@ class ActionBarBaseView : UIView {
     func translateY(_ layer: CALayer, duration: CFTimeInterval, f: (CABasicAnimation) -> ()) {
         let translate = CABasicAnimation(keyPath: "transform.translation.y")
         f(translate)
-        translate.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+        translate.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
         translate.isRemovedOnCompletion = false
-        translate.fillMode = kCAFillModeForwards
+        translate.fillMode = CAMediaTimingFillMode.forwards
         translate.duration = duration
         layer.add(translate, forKey: "transYAnim")
     }
@@ -316,7 +316,7 @@ class CircleLiquidBaseView : ActionBarBaseView {
     func open(_ cells: [LiquidFloatingCell]) {
         stop()
         displayLink = CADisplayLink(target: self, selector: #selector(CircleLiquidBaseView.didDisplayRefresh(_:)))
-        displayLink?.add(to: RunLoop.current, forMode: RunLoopMode.commonModes)
+        displayLink?.add(to: RunLoop.current, forMode: RunLoop.Mode.common)
         opening = true
         for cell in cells {
             cell.layer.removeAllAnimations()
@@ -329,7 +329,7 @@ class CircleLiquidBaseView : ActionBarBaseView {
         stop()
         opening = false
         displayLink = CADisplayLink(target: self, selector: #selector(CircleLiquidBaseView.didDisplayRefresh(_:)))
-        displayLink?.add(to: RunLoop.current, forMode: RunLoopMode.commonModes)
+        displayLink?.add(to: RunLoop.current, forMode: RunLoop.Mode.common)
         for cell in cells {
             cell.layer.removeAllAnimations()
             cell.layer.eraseShadow()
@@ -375,12 +375,12 @@ class CircleLiquidBaseView : ActionBarBaseView {
         }
 
         if let firstCell = openingCells.first {
-            bigEngine?.push(circle: baseLiquid!, other: firstCell)
+            let _ = bigEngine?.push(circle: baseLiquid!, other: firstCell)
         }
         for i in 1..<openingCells.count {
             let prev = openingCells[i - 1]
             let cell = openingCells[i]
-            engine?.push(circle: prev, other: cell)
+            let _ = engine?.push(circle: prev, other: cell)
         }
         engine?.draw(parent: baseLiquid!)
         bigEngine?.draw(parent: baseLiquid!)
@@ -437,7 +437,7 @@ class CircleLiquidBaseView : ActionBarBaseView {
         return -1 * t * (t - 2)
     }
     
-    func didDisplayRefresh(_ displayLink: CADisplayLink) {
+    @objc func didDisplayRefresh(_ displayLink: CADisplayLink) {
         if opening {
             keyDuration += CGFloat(displayLink.duration)
             updateOpen()
@@ -489,7 +489,7 @@ open class LiquidFloatingCell : LiquittableCircle {
     }
     
     func setup(_ image: UIImage, tintColor: UIColor = UIColor.white) {
-        imageView.image = image.withRenderingMode(UIImageRenderingMode.alwaysTemplate)
+        imageView.image = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
         imageView.tintColor = tintColor
         setupView(imageView)
     }
diff --git a/Pod/Classes/LiquidUtil.swift b/Pod/Classes/LiquidUtil.swift
index a7526c1..fb97f96 100644
--- a/Pod/Classes/LiquidUtil.swift
+++ b/Pod/Classes/LiquidUtil.swift
@@ -36,11 +36,11 @@ extension CALayer {
 class CGMath {
     
     static func radToDeg(_ rad: CGFloat) -> CGFloat {
-        return rad * 180 / CGFloat(M_PI)
+        return rad * 180 / .pi
     }
     
     static func degToRad(_ deg: CGFloat) -> CGFloat {
-        return deg * CGFloat(M_PI) / 180
+        return deg * .pi / 180
     }
     
     static func circlePoint(_ center: CGPoint, radius: CGFloat, rad: CGFloat) -> CGPoint {
diff --git a/Pod/Classes/LiquittableCircle.swift b/Pod/Classes/LiquittableCircle.swift
index c262134..2d7f998 100644
--- a/Pod/Classes/LiquittableCircle.swift
+++ b/Pod/Classes/LiquittableCircle.swift
@@ -61,7 +61,7 @@ open class LiquittableCircle : UIView {
 
     func drawCircle() {
         let bezierPath = UIBezierPath(ovalIn: CGRect(origin: CGPoint.zero, size: CGSize(width: radius * 2, height: radius * 2)))
-        draw(bezierPath)
+        let _ = draw(bezierPath)
     }
 
     func draw(_ path: UIBezierPath) -> CAShapeLayer {
diff --git a/Pod/Classes/SimpleCircleLiquidEngine.swift b/Pod/Classes/SimpleCircleLiquidEngine.swift
index a24bff6..f0766bf 100644
--- a/Pod/Classes/SimpleCircleLiquidEngine.swift
+++ b/Pod/Classes/SimpleCircleLiquidEngine.swift
@@ -70,7 +70,7 @@ class SimpleCircleLiquidEngine {
     private func circleConnectedPoint(circle: LiquittableCircle, other: LiquittableCircle) -> (CGPoint, CGPoint) {
         var ratio = circleRatio(circle: circle, other: other)
         ratio = (ratio + ConnectThresh) / (1.0 + ConnectThresh)
-        let angle = CGFloat(M_PI_2) * angleOpen * ratio
+        let angle = (.pi/2) * angleOpen * ratio
         return circleConnectedPoint(circle: circle, other: other, angle: angle)
     }