Clean up Code Listing assignments