Refactor: better method names
Removed useless declaration
Added docs