diff --git a/.travis.yml b/.travis.yml
index 2dbf931..9afcfb6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,14 +88,14 @@ jobs:
 
   - stage: test
     <<: *python37
-  - stage: test
-    <<: *pypy3
+#  - stage: test
+#    <<: *pypy3
 
   - stage: deploy
     # This prevents job from appearing in test plan unless commit is tagged:
     if: tag IS present
     # Run on pypy to build not cythonized wheel
-    <<: *pypy3
+    <<: *python37
     name: Build universal and cythonized bdist_wheel. Deploy bdist and sdist.
     services:
     - docker
diff --git a/binfield/binfield.py b/binfield/binfield.py
index 99fb053..35bea29 100644
--- a/binfield/binfield.py
+++ b/binfield/binfield.py
@@ -16,6 +16,8 @@
 Implements BinField in Python
 """
 
+from __future__ import annotations
+
 import copy
 import math
 import typing
@@ -94,7 +96,7 @@ def _mapping_filter(key: str, val: typing.Any) -> bool:
 
     :param key: namespace key
     :type key: str
-    :param val: nespace value
+    :param val: namespace value
     :type val: typing.Any
     :rtype: bool
     """
@@ -405,7 +407,7 @@ def __new__(
                 sname: str,
                 sbases: typing.Tuple[type],
                 sns: typing.Dict[str, typing.Any],
-            ) -> "SubMeta":
+            ) -> SubMeta:
                 for base in sbases:
                     if base is not BinField and issubclass(base, BinField):
                         raise TypeError("Cannot extend BinField")
diff --git a/setup.py b/setup.py
index 714cd0f..a0bd4f0 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 
 # noinspection PyUnresolvedReferences
 def get_simple_vars_from_src(
-    src: str,
+    src: str
 ) -> "typing.Dict[str, typing.Union[str, bytes, int, float, complex, list, set, dict, tuple, None, bool, Ellipsis]]":
     """Get simple (string/number/boolean and None) assigned values from source.
 
@@ -121,10 +121,10 @@ def get_simple_vars_from_src(
 KEYWORDS = [
     "binary",
     "binfield",
-    "development",
+    "development"
 ]
 
-SETUP_ARGS: typing.Dict[str, typing.Union[str, typing.List[str], typing.Dict[str, typing.List[str]]]] = dict(
+setuptools.setup(
     name="BinField",
     author=VARIABLES["__author__"],
     author_email=VARIABLES["__author_email__"],
@@ -133,6 +133,7 @@ def get_simple_vars_from_src(
     license=VARIABLES["__license__"],
     description=VARIABLES["__description__"],
     long_description=LONG_DESCRIPTION,
+    long_description_content_type="text/x-rst",
     classifiers=CLASSIFIERS,
     keywords=KEYWORDS,
     python_requires=">=3.7.0",
@@ -148,4 +149,3 @@ def get_simple_vars_from_src(
     install_requires=REQUIRED,
     package_data={PACKAGE_NAME: ["py.typed"]},
 )
-setuptools.setup(**SETUP_ARGS)