Quick Code Cleanup.