Restyling the docblock and renaming some methods