Further editing on comments