Revert "fix & comments"

This reverts commit 4117f10a501031341fd72ba22d5a4532355a1680.