P31XX: some formatting cleanup

Change-Id: Ib70ee152c2b4d4538bab5053175770933094aeea