Add documentation
Refactor methods name