Currently some files have type hints and some do not. All of them should have consistent, mypy compliant type annotations