Adjust the organization a bit and update some of the comments to

better explain what's happening.