Added constants. CRLF cleanup.