additional comment and cleanup