This commit does not introduce any new functionality. This is a cosmetic change. It removes redundant comments, unused variables, indents to a common guideline.