Replace URL variables with ones generated from Enums
Replaced String if else with Enum switch case