Some small changes
Move things around a bit
Some improvements
Reduce one possible answer for p4