Made edits based on review comments