Code Cleaning.