diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3f1f7f8d..1338136d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -50,7 +50,6 @@ repos:
     - flake8-debugger
     - flake8-isort
     - flake8-string-format
-    - flake8-type-annotations
 - repo: https://github.com/PyCQA/isort
   rev: 5.12.0
   hooks:
diff --git a/setup.cfg b/setup.cfg
index 82152122..8b703af1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -104,13 +104,16 @@ exclude=.asv,.eggs,.tox,.ipynb_checkpoints,build,dist,.git,__pycache__
 add_ignore=D400,D415
 
 [yapf]
+spaces_before_comment=15, 20
+arithmetic_precedence_indication=true
+allow_split_before_dict_value=false
 coalesce_brackets=True
 column_limit=99
 each_dict_entry_on_separate_line=False
-i18n_comment=NOQA
 space_between_ending_comma_and_closing_bracket=False
 split_before_named_assigns=False
 split_before_closing_bracket=False
+blank_line_before_nested_class_or_def=False
 
 [isort]
 line_length=99
diff --git a/setup.py b/setup.py
index 89dadf58..747fa2f4 100755
--- a/setup.py
+++ b/setup.py
@@ -10,6 +10,7 @@ if sys.argv[1].lower().strip() == 'make':  # exec Makefile commands
     import pymake
     fpath = path.join(src_dir, 'Makefile')
     pymake.main(['-f', fpath] + sys.argv[2:])
+
     # Stop to avoid setup.py raising non-standard command error
     sys.exit(0)