Revert "Fixed indentation"

This reverts commit 9d36af068920ccc487c04ae0d828fb6f353a65f0.
Revert "Removed commented code."

This reverts commit 13a05e5f459d350272711927dda9efebc88ee891.