Code Cleap Up