Code cleanup.

Code cleanup