pass #2 - minor cleanup