small changes
clean-up