Use constants instead of magic values