Code cleanup.

* Fix for coding style.
* Remove unused/-necessary code.
* Fix whitespace.