Clarified var names