Added some explicit type annotations