revert trivial changes and add comments