correlation with documentation and cleanup

left the saving of validated tenant and token  in same place for the time being. I tried to make changes, but I couldn't get it to work properly. Will revisit this if I have time after i do my keystone tasks, or in my free time this weekend.