Fixed missing type hint and test
Whitespace and unused variables maintenence