some lint clean-up