Cleaned up constants.
Code cleanup.
Code cleanup.