Refactoring names on methods and fixing some documentation