Corrected version.
Code cleanup.