diff --git a/format_and_lint.sh b/format_and_lint.sh
index e7795e8c..75a89a6e 100755
--- a/format_and_lint.sh
+++ b/format_and_lint.sh
@@ -1,10 +1,4 @@
 #!/bin/sh
 
 # Run ruff to check for issues and fix them
-ruff check . --fix
-
-# Run docformatter to reformat docstrings and comments
-docformatter --in-place --recursive --wrap-summaries 79 --wrap-descriptions 79 .
-
-# Run black to format the code
-black .
\ No newline at end of file
+ruff check . --fix
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index bb606784..14485625 100755
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -99,7 +99,7 @@ extend-exclude = ["test", "tutorials", "notebooks"]
 line-length = 79  # PEP 8 standard for maximum line length
 
 [tool.ruff.format]
-docstring-code-format = false
+docstring-code-format = true
 
 [tool.ruff.lint]
 select = [
@@ -129,7 +129,7 @@ ignore = [
 ]
 
 [tool.ruff.lint.pydocstyle]
-convention = "google"
+convention = "numpy"
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F403"]