1. Code Cleanup