Code Cleaning - New Todos