Improve formatting issues.