Renaming variables to improve code reading