minor variables changes