Fix spacing issues

MSP-10034

Fix spacing issues highlighted by Pull Review.