Revert "reformat code + PVRfixes"

This reverts commit 035314ce93341cf31cbaa1dc3e1fa3bc51469cd7.