Trying to reduce complexity of the new from auth hash.

Should improve a bit of code climate.
Improving a bit of code climate again.