P31XX: some formatting cleanup

Change-Id: I0cd4490ee5cc0d62f28492a6f4a7194828bca1bf