Removed some unnecessary typehint