small cleanup

A bit more cleanup.