SG fixes and remove extra whitespace