Improvements in formatting