Update pbr usage to modern understandings

Explicitly, d2to1 is the devil. Updated pep8 issues.

Change-Id: I35307f820a98244f5a9ae32ce01f18ce7b434c19