Renaming variables and code style