Cleanup DocBlocks and comments.

Removed unnecessary whitespace and added missing variables to the DocBlocks.