General code cleanup.