Remove uneeded fields.
Remove unused fields.
Remove unused imports.
Proofreading.
Improve typing.
Merge pull request #37 from seintur/proofreading

Proofreading