DAR-826, fix inconsistent quotes and new lines
DAR-826, fix typo