Code Cleanup.
Cleaning.