Revert "Revert "Added comments, light formatting changes.""

This reverts commit 7c951d74314023f47f0c85f2aca82c52f66a5fcf.