Cleaning throttle body

My revs go up and down like crazy every now and then when idle or creeping along in traffic. I'm going to get some carburettor cleaner after work and going to detach the throttle body to give it a clean to see if this helps. Couple of questions on this if I may: -

1. For cleaning, am I just to be cleaning out the top? What other sections should I be cleaning? Are there any good guides? I understand not to force the butterfly when doing this.
2. I've read various things on the net saying that the throttle body will need to be reset when I put it back in? Is this something I can do myself or does it need to rigged up to VAG COM?

Many thanks!