Cleanup of constants

Cleanup of constants