Minor code cleanup suggested by scrutiner-ci
Fix type hints and re-order imports
Fix docblock type
Merge branch 'code-cleanup'
Bump version to 0.3.0