Add some return type hints

Remove a couple of unused variables

Improve some existing parameter type hints

__method__ -> __METHOD__

Change-Id: I3e9bb75dbc01505cc3ffee24d5c9edd81d0f0632