TORG-74: CS, docblocks, typos