Sort out comments