making proxyCallback URL optional and some minor improvements
formatting