Renaming some methods and adding better documentation