Revert "retab and comment"

This reverts commit 6aee2a63295c067910e5af563049d775dccb0388.
1