Commented some code
Revert "Commented some code"

This reverts commit 22e6e6cb1b5daeafad22cc1debee213af022e7a1.
Revert "Revert "Commented some code""

This reverts commit fc1562c97613a642c8342655807f06865b35da89.