Formatting, cleaning, and sanitizing docblocks
Getting ready for 3.6.0