Docblocks, minor cleanups