Edits after review [KFSQA-860]