docs
A bit of renaming
docs
Refactor signatures