[issue #166][done][fixing reviewer comments, adding spaces and single quotes to double quotes]