- More style cleanup
- simplify chained comparison