This should all be commenting and clarity fixes. There should be no functional changes with this commit.