more minor cleaning. still no logic changes.