more small clean-up