WHitespace
Correct variable name
Remove switch case regarding the setting of a base URL