slightly more cleanup, hopefully no actual functionality changes