More basic code fixes.

Summary:
This is a non-change.

It only fixed whitespace issues, comment errors, and some simple syntax
issues, introduced by our changes.

These changes will be folded into the diffs which contained these errors
in future branches, but, for this branch, they are all here.

Test Plan:
Jenkins
git diff -w shows only non-functional changes.

Reviewers: rudradevbasak

Reviewed By: rudradevbasak