some cleaning
more clean-up