changed variable wording & cleanup