simplifications, renaming, docs
one more link