Did code cleanup.