Code Cleanning