minor changes and clean-up