Code clean up pass #1.