Small changes
clean-up