Added a comment from me. Some reorganization.