[zendframework/zf2#3585] CS/logic cleanup
[zendframework/zf2#3585] CS/logic cleanup

- Re-work conditionals to reduce nesting
- Minor whitespace changes

lynnint/zend-authentication,Maks3w/zend-authentication,MadCat34/zend-authentication,malukenho/zend-authentication