docs and clean-up