Beginning refactoring of variable names (UGH)