small tuning and clean-up