Adding some constants
Replacing the hardcoded numbers with constans