Removing unnecessary check on token key
Save token_name call
Inline isMethodEmpty call
Missing type hints