Docblock formatting
Docblockings
Minor fixes