Code cleanup.

Cleaned the code up a bit, for clarity.