Renaming variables to be clearler