more clean-up, documentation