Code clean up.

Not again.