Improve formatting
Improve formatting. This version for draft printing