Merge "Fixing the rest of the comment spacing issues"