Cleanup; making different versions more explicit.
Added a couple of comments.