Pull URL formatting up into consumer module