renames varables, updated JsDoc