Code Cleanup Pass 2 (Types)