diff --git a/src/Screen/Cursor.php b/src/Screen/Cursor.php
new file mode 100644
index 0000000..c3d91e2
--- /dev/null
+++ b/src/Screen/Cursor.php
@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+
+namespace seregazhuk\PhpWatcher\Screen;
+
+final class Cursor
+{
+    public function startOfLine(): void
+    {
+        echo "\033[1D";
+    }
+
+    public function erase(): void
+    {
+        echo "\033[1K";
+    }
+
+    public function write(int $foregroundColor, string $text): void
+    {
+        echo "\e[38;5;{$foregroundColor}m{$text}\e[0m";
+    }
+
+    public function hide(): void
+    {
+        echo "\033[?25l";
+    }
+}
diff --git a/src/Screen/Screen.php b/src/Screen/Screen.php
index a6d0ef8..e3e6bff 100644
--- a/src/Screen/Screen.php
+++ b/src/Screen/Screen.php
@@ -67,7 +67,6 @@ public function start(string $command): void
 
     public function restarting(string $command): void
     {
-        $this->output->writeln('');
         $this->spinner->erase();
         $this->output->writeln('');
         $this->info('restarting due to changes...');
diff --git a/src/Screen/Spinner.php b/src/Screen/Spinner.php
index f4464e4..413c6c9 100644
--- a/src/Screen/Spinner.php
+++ b/src/Screen/Spinner.php
@@ -68,14 +68,21 @@ final class Spinner
         197
     ];
 
+    private $cursor;
+
     private $currentFrameIndex = 0;
     private $currentColorIndex = 0;
 
+    public function __construct()
+    {
+        $this->cursor = new Cursor();
+    }
+
     public function spin(): void
     {
+        $this->erase();
         $this->output();
         $this->increment();
-        $this->hideCursor();
     }
 
     public function interval(): float
@@ -85,12 +92,12 @@ public function interval(): float
 
     public function erase(): void
     {
-        echo "\033[1K";
+        $this->cursor->erase();
     }
 
-    private function currentColor(): string
+    private function currentColor(): int
     {
-        return '38;5;' . self::COLORS[$this->currentColorIndex]. 'm';
+        return self::COLORS[$this->currentColorIndex];
     }
 
     private function currentFrame(): string
@@ -100,12 +107,9 @@ private function currentFrame(): string
 
     private function output(): void
     {
-        echo "\e[{$this->currentColor()}{$this->currentFrame()}\e[0m\r";
-    }
-
-    private function hideCursor(): void
-    {
-        echo "\033[?25l";
+        $this->cursor->write($this->currentColor(), $this->currentFrame());
+        $this->cursor->hide();
+        $this->cursor->startOfLine();
     }
 
     private function increment(): void