Fix CS and doc blocks
Fix CS