1 files changed, 3 insertions, 3 deletions

diff --git a/src/tg/message-entity.lisp b/src/tg/message-entity.lisp
index 3413763..c7e6ba1 100644
--- a/src/tg/message-entity.lisp
+++ b/src/tg/message-entity.lisp
@@ -37,7 +37,7 @@
 
 (defun message-entity-extract (entity text)
   (with-slots (length offset) entity
-    (if (= length 0)
+    (if (zerop length)
         ""
         (let* ((start (iterate
                         (with curr-idx16 = 0)
@@ -46,7 +46,7 @@
                         (when (or (= curr-idx16 offset)
                                   (> (+ curr-idx16 curr-width) offset))
                           (return curr-idx32))
-                        (setq curr-idx16 (+ curr-idx16 curr-width))
+                        (incf curr-idx16 curr-width)
                         (finally (return (length text)))))
                (end (iterate
                       (with curr-len16 = 0)
@@ -54,6 +54,6 @@
                       (for curr-width = (utf16-width ch))
                       (when (>= curr-len16 length)
                         (return curr-idx32))
-                      (setq curr-len16 (+ curr-len16 curr-width))
+                      (incf curr-len16 curr-width)
                       (finally (return (length text))))))
           (subseq text start end)))))