cleaning up PSUL and making it easy to do the 20158 switch

I personally like the first one, matter of taste :-), its more concise.