Additional clean-up and documentation update