Code cleanup Pass 3
Code cleanup Pass 3