Improve typing usage

Merged
VI
1d ago
+484-451