Added better docs
Added better docs
Code clean-up