Adding some quotes for better handling of unset variables
Remove extraneous reference to CGM repo