[PICA] Some more cleanup. Maintain formatting in notes.

Take a look at these latest updates. I'm ok with merging this now.