Minor updates to Get-Tokens.ps1

Added some missing logic, minor code cleanup.