Improvements to format builder inline comments