Use better constants.
Formatting