JSdoc and renaming done. Tests needed.