Code Cleanupo