Shorten the driver var
Simplify expression
More PP refactoring