Some code cleanup + updated docs
update version