edited content and style based on comments: