Add Doc and clean-up