Fixed production default URL & refactored