Started code cleanup.