Code Cleanup Pass 1