General type hint cleanup
Merge pull request #124 from wmde/typehints

General type hint cleanup