Rename variable to be more descriptive, reduce duplication