Removed some superfluous type annotations
Fixed docstring
Improved class documentation