Improvements in formatting helpers