deprecated unused variables
added type hinting, added tests