Fix CS and typos