Formatted some comments and commented-out code