Revert "commentary and reindent"

This reverts commit 455dc7bc89f45e42e6d962d86ca7bbb31fb88b3b.