Code fixes

* Remove TODO comment
* Typehint object parameters
* Remove unused variable argument
* Add end newline character