Comment; rename a few elements for clarity