use constants instead of magic values
Merge pull request #7076 from BevapDin/magic-values

use constants instead of magic values