Refactored values to variables