Change arbitrary numbers to constants variables
Add more constant variables