just a quick refactor on var name (shorting them)