Refactor Access token status to be not null

Instead of null were now using an UNKNOWN status
Also some minor clean up