Code cleanup.
Code cleanup.