Minor rearrangmenet and more comments.