Move that above, it's an accessor.
One line `userInfo` creation.
Update per review (the easy ones).