Add documentation. Clean methods doc blocks and rename params