rename a few vars for clarity