Unindent doc-blocks
Some CS fixes