Clean up how token endpoint params are created
Change how authorization endpoint params are created