small clean-ups