a few minor clean-ups