* Some code cleanup.