fix comments and some indentation.