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

I also like the first best. Thanks for all good tips and comments guys! @mariogiov @guillermo-carrasco