fixes for code review items - double quotes, unused references