Changed variablenames and comments