change var names for clarity