CON-2280 comments spacing fixes