Renaming variables to be more readable