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

This is perfectly valid Python but I believe the Officially Recommended way these days is to use `str.format` methods instead, which allows a little more flexibility with string formatting. You can read more about them here: https://docs.python.org/2/library/string.html#format-examples