Cleanup.
Code cleanup.