Some modifications (comments, line break ...)