getting rid of some more variables
proper type hinting in Docblocks here