Revert "Added comments, light formatting changes."

This reverts commit d33fdca8fe2ad361b20921c7c7680a7ba9d4dea7.