Get rid of all outdated "ClientIdentity" terminology.
Whenever it makes the code easier to follow, use early return to avoid else statements.