cleanup. Added comments to note properties.