Code cleanup.

* Indentation fixes.
* Comment cleanup.
* Test code removed.