Refactor using more intuative variable names