Improved commenting and formatting
Revert "Improved commenting and formatting"

This reverts commit ce8ddc25a7aef797a8bea572a32d10d3852a1dac.