Done code cleanup.

Final Source .