Improve formating.