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

General type hint cleanup