Fix CS and comments