Minor code formatting. Allowing UserDefined parameters to be in the baseURL as well