diff --git a/.gemini/GEMINI.md b/.gemini/GEMINI.md
index 9161c9f..226a40d 100644
--- a/.gemini/GEMINI.md
+++ b/.gemini/GEMINI.md
@@ -15,9 +15,8 @@ This is the main FlightPHP core library for building fast, simple, and extensibl
 ## Development & Testing
 - Run tests: `composer test` (uses phpunit/phpunit and spatie/phpunit-watcher)
 - Run test server: `composer test-server` or `composer test-server-v2`
-- Lint code: `composer lint` (uses phpstan/phpstan, level 6)
-- Format code: `composer format` (uses squizlabs/php_codesniffer, PSR1)
-- Check code style: `composer phpcs`
+- Lint code & Check code style: `composer lint` (uses phpstan/phpstan, level 6)
+- Beautify code: `composer format` (uses squizlabs/php_codesniffer, PSR1)
 - Test coverage: `composer test-coverage`
 
 ## Coding Standards
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 9161c9f..226a40d 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -15,9 +15,8 @@ This is the main FlightPHP core library for building fast, simple, and extensibl
 ## Development & Testing
 - Run tests: `composer test` (uses phpunit/phpunit and spatie/phpunit-watcher)
 - Run test server: `composer test-server` or `composer test-server-v2`
-- Lint code: `composer lint` (uses phpstan/phpstan, level 6)
-- Format code: `composer format` (uses squizlabs/php_codesniffer, PSR1)
-- Check code style: `composer phpcs`
+- Lint code & Check code style: `composer lint` (uses phpstan/phpstan, level 6)
+- Beautify code: `composer format` (uses squizlabs/php_codesniffer, PSR1)
 - Test coverage: `composer test-coverage`
 
 ## Coding Standards
diff --git a/composer.json b/composer.json
index 836e208..611c2d2 100644
--- a/composer.json
+++ b/composer.json
@@ -97,9 +97,11 @@
             "rm server.pid",
             "echo \"Performance Tests Completed.\""
         ],
-        "lint": "phpstan --no-progress --memory-limit=256M",
+        "lint": [
+            "phpstan --no-progress --memory-limit=256M -n",
+            "phpcs"
+        ],
         "format": "phpcbf -q",
-        "phpcs": "phpcs",
         "post-install-cmd": [
             "@php -r \"if (!file_exists('phpcs.xml')) copy('phpcs.xml.dist', 'phpcs.xml');\"",
             "@php -r \"if (!file_exists('phpstan.neon')) copy('phpstan.dist.neon', 'phpstan.neon');\"",