CS: fix comments + spaces