clarify variable names, condense further