* code cleanup.