cleanup: add comments