Fix cs errors and comments

#3541