Minor code cleanup.

Removed some unused code and modified the spacing (e.g. removed unnecessary white space, translated tabs into spaces, etc.).