Move constant for cleanup

Mikhail Mazurskiy requested to merge ash2k/move-constant into master Feb 02, 2022