Remove unused variables
Add additional type hinting
Remove TODO comment