Use uniform casing
Simplify